Merge commit '3f53f784c7cbe57a2c025b0842bdf6d9ffa2a95a' into HEAD

Change-Id: Ic2c3eaa116a991298fce5fba7b9558cbd0ea10c3