Merge e8de5045ad113989787b8c21ce4fbb8d18f287f3 on remote branch

Change-Id: Ib8396a9ed08e1e8f0e1c6037814f67fc54ce9fd9