Merge d0ec23db1e3a775364372a78c72b190e2e0b7348 on remote branch

Change-Id: Id4f5058de28b25c81e42ea826be5a1a6d586a2a8