Merge 48c0417195305ec21d7126099bd55f3b2889b030 on remote branch

Change-Id: Ieef04b2fd32ab899caab8970a35ca71df0616f29