am 92e25f7b: Merge from AOSP staging branch

* commit '92e25f7b0494d31bee73057cf27d93106fb92999':
  Use appropriate notify method instead