Merge 0e307776f73160c64a7195aa858e693e534e4260 on remote branch

Change-Id: I64b9066a0cee51faca5c1038be3f076918a2764c