am: cd77ac47 Bug: 113071724 Change-Id: Ie80023d8ac23961a1c161219ff4cec806c3f53b4 (cherry picked from commit ab477274)