Bug: 17208457 Change-Id: I35555e0acf3b37bb3776a62c64d59ae93403b237 (cherry picked from commit b894a19d)