Merge dd3b5425bece14aafac8b0d2f74c5a5859cc7f54 on remote branch

Change-Id: I446fb0fd7c0664d5c12a16aef38c8104300259ec