Merge abc93859b70a62b5785144c36ec9080225bcce4a on remote branch

Change-Id: Ia6d310d70046b6165ebd0ed047eead594d35c48c