This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,71690 Change-Id: I8ebe7f3bce84e76c903908768d010f46f3a30a4c
This is a two-parts CL, Its counterpart is https://android-git.corp.google.com/g/#change,71690 Change-Id: I8ebe7f3bce84e76c903908768d010f46f3a30a4c