Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6

Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b