am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '8c013aeeecaecb2a0a1038433d0d7a603a57ac30':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e