Bug: 18283088 Change-Id: I5da92f270232ba6fd443ac9c536a8c6bdd01ec22 (cherry picked from commit 24bf010b)