Merge aaf29e9002377e42254dd1d0295310991ae0379d on remote branch

Change-Id: Icd939d7b7ea87f5890edb249ca6265a78c2779ab