Merge 0372cd47cbecd8d5b9148f199ef809352309fd10 on remote branch

Change-Id: Ib100519c5054dd565eb2255eae15b2bdfafd7844