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

Change-Id: I455faf963dbceb4c23a48d668d32e9b8f8faa06b