Bug: 193476758 Test: build pass Change-Id: I4ae9f7920d29a28151a1f73ed379aa9b60552e02 Merged-In: I13a5312f6224de4ad0d624bdba4b443ce86330aa