Merge 1bda8f59a4ec3ab2499b4c94a6827de50ebcfcf0 on remote branch

Change-Id: I4dbd734d76cfdbcd8a3441c635d30f71c1b1ae09