Merge b6a1f3570fdb92f639e34c568d351052f157c4ba on remote branch

Change-Id: I95d39679b98070391e7d932e52c235a39dcebe2d