Merge afbc1c1280277ef9eb1a7aca8b6cd76179213309 on remote branch

Change-Id: I82dfb7518da1eaa32f78ee06dd76c8599ccac0d4