Merge commit '09c09e77ca51cf11ba949a2c49efee4c385c4a0c' into HEAD am: 1c4a17aba7 Change-Id: Ib6973eedfcaca76b348fa04addf05c356015d4e5