Merge ae5a343eba8f46698de581082ceaecd3e0d8fb59 on remote branch

Change-Id: I1272319f7ebbdd465d28c810cc1dcb7cc23f6ca2