Merge d309728b300058a393ec952b2ea8ba26992f0d8b on remote branch

Change-Id: Ib2d1009a0485aea33736bc170ea497d3996fef14