Merge 56730399404956aa2adcd4aea617f5f5b2846d36 on remote branch

Change-Id: If7aebc732b7e0fe6633388f7ebb9cb467f4b7563