Merge 616d6b9c79a979c9ab35c6bb9ff8ecc9e968b12f on remote branch

Change-Id: Ifcde35248e335bea014c3c27ff324f395d7cf8c6