Merge "Fix build.gradle file" am: e0039d8613
am: f4e9b7c834

Change-Id: I66aeebbe9e1d1674f47ac3ea99831e2fab9a0de4