Merge b44fce87cb2071d9f90e14793396eeed51d3441e on remote branch

Change-Id: I2b46cf6887ebcae5edaae27ba9ad6963e53878d4