Merge cd59eed29803d232d41a13df470e7a90e21c87d2 on remote branch

Change-Id: I6913e4948dfd56d898d04d3521c64e90b0b9b025