Merge 503821665731a283c77ff4631e644e95905c080c on remote branch

Change-Id: I1123e124f858b1cd375f54ff679a8e19f5ab04d3