Merge bb90a07aec4fe18f10a24a0a85fb33a3edb1f484 on remote branch

Change-Id: Ib2760e4e7dd133c09e327e3a34370173778abbbd