diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ded3617d..f2fd86fe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,9 @@
   ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	package="no.nordicsemi.android.nrftoolbox"
 	android:installLocation="auto">
 
@@ -41,7 +43,9 @@
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
-		android:theme="@style/AppTheme" >
+		android:theme="@style/AppTheme"
+		android:name=".ToolboxApplication"
+		tools:ignore="GoogleAppIndexingWarning" >
 
 		<meta-data
 			android:name="com.google.android.gms.version"
diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml
index 53be4bc7..70ad70e0 100644
--- a/common/src/main/AndroidManifest.xml
+++ b/common/src/main/AndroidManifest.xml
@@ -20,9 +20,11 @@
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="no.nordicsemi.android.nrftoolbox.common">
 
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
 </manifest>
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index 3aff18c2..7fecc1bc 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
   -->
 
 <manifest package="no.nordicsemi.android.nrftoolbox"
-	xmlns:android="http://schemas.android.com/apk/res/android">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools">
 
 	<uses-feature android:name="android.hardware.type.watch"/>
 
@@ -36,7 +37,8 @@
 		android:icon="@mipmap/ic_launcher"
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
-		android:theme="@android:style/Theme.DeviceDefault.Light">
+		android:theme="@android:style/Theme.DeviceDefault.Light"
+		tools:ignore="GoogleAppIndexingWarning">
 
 		<meta-data
 			android:name="com.google.android.wearable.standalone"