Merge 644936fbcf08472155b929b3d2f5dda1f4ee18f6 on remote branch

Change-Id: I545085c0bf3266b3ce2e738dc99ad1623f072a68