Bug: 15720445 Change-Id: Ibfd196d80be030b694473faa24b746536daa3107 (cherry picked from commit 7325abcd62)
7325abcd62