Bug: 18105751 (cherry picked from commit 3f8d941d) Change-Id: I445c7f39b728ea6f45f3cb7dd8ed96509cf6f1c5