Bug: 130174575 Test: none Change-Id: I7684f9e06f4d226010448e5520965a8733c43073 Merged-In: I7684f9e06f4d226010448e5520965a8733c43073 (cherry picked from commit 12f75864)