Merge 6d444d22e3321cfdd3038368f43439ba4c7ee972 on remote branch

Change-Id: I015e6caebec7b0aa3bc2c88cce555b3b0bf46b6b