Merge d4770caf31ab247aad45c193018c6454bedd2fbf on remote branch

Change-Id: I64c952cc186a4b63c25700ea9b1a25351688621b