Merge ed616b9e9122cd8e8bc10d38bb5d055d6cf5a48e on remote branch

Change-Id: I34fec36818c6b5b3c87af07e363867e3ec0892be