Merge 79c187cc3e80ab775682af47b0de0887b48abbb3 on remote branch

Change-Id: I135fb301efffe2de500a5a32093b5d120d08a062