Merge 9eefa9673342e8e576a0f0a025a2fd52b0303d49 on remote branch

Change-Id: I9bd7f88c41fc9ed2f2b821677b16d7940a5a84c9