Merge f6821ed632eddd5105210c3afb2caee0adba2f87 on remote branch

Change-Id: I4dcb1be236f46df33269dc3c206456d82a6de856