Merge 0adec14cf9b78d71929383f1fafd4958ad66548a on remote branch

Change-Id: If7739970e573add8ea9efb21cdf30e1dcda3a5fc