Merge 56e53b0085162cc470c4144ee13dccc34613fff5 on remote branch

Change-Id: Ied747823a21cd479d094b11786d69186318bf27a