Merge d5352c6a2e62160b04f591125f3f344edea8740f on remote branch

Change-Id: I8490c41ddddea5d5a9230bac1c15a37debb8868e