Merge 0284cba6770b2e5bb12307b67bb8caecb6daa932 on remote branch

Change-Id: Ic43e6fb21e01ad69c62a239d266d7da577f0a457