Bug: 140889664 Test: N/A Change-Id: I6bf37ed236e81fbcca50046b5a9b649685affb4a Merged-In: I6bf37ed236e81fbcca50046b5a9b649685affb4a (cherry picked from commit a824a64b)