Merge 87179f0216248c86fd4bb9c10a4248e2e6680ba5 on remote branch

Change-Id: Iadb31f705c52adff235076cb91053702fdcdc183