[automerger skipped] Merge commit '04bb1f2f035343217875ce0fc19d3a7abde41717' into HEAD am: 49cc930fca -s ours am: 594151d14d -s ours

am skip reason: Change-Id Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227 with SHA-1 b873b9f497 is in history

Change-Id: Iabf1797a02499f16eaee4f762a7258583fcb0aed