Bug: 193539271 Test: make Change-Id: Iac651f2ca4269f20a2c7e87c7b6edf1d6c992867 Merged-In: Iac651f2ca4269f20a2c7e87c7b6edf1d6c992867 (cherry picked from commit 0594b4f4)