Merge 3974d435c78251ed29daf3c71f1c21fc1bb639da on remote branch

Change-Id: Id20f36534920c8383ebd2a47b3715f26eb9da6ed