Bug: 13177500 Change-Id: I1581c7ca8ac6d931375fc2cbcbe13f43513ce3c7 (cherry picked from commit a586535b)