Merge ef36a93d9166a951bcfb360a581767676e9867e1 on remote branch

Change-Id: Ib095d56b1a5830683aa8f734e3bf0bc2e5a6cb4f