Merge ef1e721d45bbe35e783566fbad75811f67ec1f6f on remote branch

Change-Id: I54790a7533fa3cb6703a8d4024731ba9819c36b6