Merge a4907cdba3fd4b89f98ebcded601405e49805076 on remote branch

Change-Id: I6cd7c4760f9e4e617e9cc727607ff61ee3be1aa8