Merge 22a4c27eaef39de325ce86ef6ddea762dd9019cc on remote branch

Change-Id: I2627f7997cd07cf24fe4607f93e8be607234f87d