Merge cefdfdba138b3f34186536b73ab1237dd247a6c3 on remote branch

Change-Id: I34fdb6d1ac2a38c8db5ca8a36e2cf1a8e68c26cc