Bug: 31037341 Change-Id: Id6e5ea55f2fed93f1afdd0f61028e3329c8a43c3 (cherry picked from commit 7fba3920)