Merge 8353f56116066bfcceb6a2deb1d9a691c3c4c1f1 on remote branch

Change-Id: I3e99bdc1bcc69a31946397b749554d4f28d202a8