Bug: 179354495 Test: m nothing Merged-In: Id1dd09a11c63981b32af524cffcdbd177c8f0232 Change-Id: Id1dd09a11c63981b32af524cffcdbd177c8f0232 (cherry picked from commit 86fe8f85)