Merge bbce14bd76e755c32204b4056eb6583820a10a9b on remote branch

Change-Id: I047802dcb2fc443eb0416e730b9f83fe0cf8f50f