Merge 19d5f6caba1cdf6759a8518ee55ab7a85e03893f on remote branch

Change-Id: If26eb249ff394b81420fb016f5eea8d8c913ecc4