Bug: 17003763 Change-Id: I87f84a376ccf057f4073ec58bc0599e9615b95ac (cherry picked from commit 3797c659)