Merge 5779a8a34b07654bd1489eb7d3bc3b908cb2573c on remote branch

Change-Id: Ieafab44dd923616fccbc034f21ab34ffc2c02922