Merge edd59c44d8881bf59bbad4aaed2271ddef981dc9 on remote branch

Change-Id: I56bacfcc5fc378610f018e3eb5ada0e9c339737d