fetch merge update

Change-Id: I5a87dae6194b0e88a76512207176c221c32bc272