Merge commit 'e78aa19fbce078838633a9ea2baeca8b2d77e4c8' into HEAD

Change-Id: I3f0d47053e6ac512a00beaeaa92640ef64489ee9