Merge e2f552a27b4850fb2d848a70c6c5e158eb02f733 on remote branch

Change-Id: Ie276a621ceac2f76cc0464d89d405412d925700f