[automerger skipped] Merge commit '864a2b0e' into manual_merge_864a2b0e25da01885f558bde41e9da73801c790e am: 12e3b85d -s ours
am skip reason: Change-Id Ia2c1c6e82eef7ba25fe4c090ffa02bff5c3ddca2 with SHA-1 b7ec5bbc is in history
Change-Id: I476cb61bcb1f0b8befe1d6497da0faf7eb34266d