766b5c4342
Bug: 12118307 (cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e) Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c