Merge 0c3cba961bece0924591705ea26e6069b587e19d on remote branch

Change-Id: Iad5c41bfac61e7b211dff0b73d85f6cf7628168f