Merge 5cfcd35cad728dbaf158eab9262c17b9c1097747 on remote branch

Change-Id: I6a8fb85397cad6b58a895b1045df669cb58561b7