Merge e7b55c8d6d823d58ea877b8819ed9669eb94034f on remote branch

Change-Id: If386bd88de27b16d3358a525ffbb0d8fb9d136f4