Merge e59b460a6e916af91c043f98ac7f9b96e7ab4c8a on remote branch

Change-Id: I1d5e2ff603869d8de2d38bef059d1c01509850c0