Merge f6bacaf8ba5f3276e353c373c583878869022b34 on remote branch

Change-Id: I5b596cbb57be99da8c891ad2598e16ecfeee436d