Bug: 16874447 (cherry picked from commit 59c1ee44) Change-Id: I70839632974367c8b9893fb1f9c5ee4364608470