Merge 2f6517ef189589b6490c271ab1e2452dfc61a706 on remote branch

Change-Id: I31895466bcf826a0dc5dc64c5fb27c23a68abcc4