(cherry picked from commit c6c633608a) Bug: 12798969 Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
c6c633608a