Merge edcc74bcadb62fc4da0b04ae856b56d21b837091 on remote branch

Change-Id: I4a756ae5f68bb26d43121d4b00a84fedd5adf1d8