Merge 16fbf994cbd66b7afbb2db9a610686de90622483 on remote branch

Change-Id: I4d9c8861b9b49d93fb1cac92d1f73eeb767189b9