am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '690af1285c320a1d3fc31cc57414347c74bd8e1d':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e