Merge commit '75d29775398d5033a6a3e67a307a8fbc1299b53c' into manual_merge_75d29775398d5033a6a3e67a307a8fbc1299b53c

Test: Treehugger (twice)
Change-Id: I0bf81ab5e7bfea79c5e92c8620b3bb924096641d
Merged-In: Id3a3d0b2b66d31c48274f8a986e86e9ed1d28f34
Merged-In: Ie01637a10b356b80b5aa62291a97f2c167242827