Merge 80fa33019df2c6c95eab51da180825834625c0f5 on remote branch

Change-Id: I53d524690b24ca128ee317b85004505125c949c4