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

* commit 'fb198383cc3c786ed303e49e29c8d0b86f38be73':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e