Bug: 192615532 Test: m Merged-In: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 Change-Id: I0ea1c35f7ce4dd6f6bde02874e02ed190fa2e904 (cherry picked from commit 57fe5105)