Merge "Fix build.gradle file" am: e0039d8613 am: f4e9b7c834 am: 0444957ac3
am: c8f84aac0c

Change-Id: I29a1fb2f8c31b7bc1d0057648ce3c68dfb7e8929