bug:12445874 Change-Id: Icf8356cc643698fea2eee686edaf772d74680e91 (cherry picked from commit 052fc0ab)