Merge be3208f55e478b234f1c1f6e3986dc3dd2d17551 on remote branch

Change-Id: I48c2e064f69d3e43075a89fbcbdd04837873d91c