Merge ef4f148641fec73ae91368634f0ab0372375ca84 on remote branch

Change-Id: I92668bba56e070fab7b6fa1232ca8860fd7d489d