Bug: 137181479 Change-Id: I81a2938cfb39c0d5975f933244e61e6dafa1e834 (cherry picked from commit 2aa8d0d9)