Bug: 193539271 Test: make Change-Id: I3c152147ebbb73cd8318323e82853ec4e0c88e38 Merged-In: I3c152147ebbb73cd8318323e82853ec4e0c88e38 (cherry picked from commit 50b1bab0)