Merge 1d61ff81388f430d612a9b29b44a06c25e6e4b0f on remote branch

Change-Id: Id9304d8e3dd5ee0b7d38d5ef2a1ec67e8234c8e7