Merge dbd9e3bdc5d6a3d480ebd9e0c78188f095f9a89e on remote branch

Change-Id: I52bc5ae9e2f9f0105992c70673f42a37a6e780f1