Merge bb5055957ba212160365fa28241cc5584a68001e on remote branch

Change-Id: Ie78f7123f4687cac87fda14babd2f8552a9658b6