sync codebase to master

Bug: 193476758
Test: build pass
Change-Id: Ic2e45d4f989ee09418c563a69075d69f730876ea
Merged-In: I8a83a549a6c0cf8dd174c52b8377e3bd5dcbea37
4 files changed