Merge c66ed82e06dd51e57032e132de28a8df745f302d on remote branch

Change-Id: I6e257a211ec6bee4d5df7ba8b6228cf3c695354a