Merge 5b6fc19e5b86f3e216e6f9ca7835b10aa4ca4e63 on remote branch

Change-Id: Ieb84c83a3b123dd09fe37b6818d42ed2977f370c