Merge 8159b11b7522ed553bc3bbce2c1fc340fb9456f6 on remote branch

Change-Id: I0bfe6e96039533efe5602eb3bf11f1fbc57ee044