Merge 49db0a86fe1e1bc40e99509a9e5fe8189a3b5756 on remote branch

Change-Id: I555399291e3731b765ddac5b158fa0d82f10237d