Merge 49459fcf846543b539731f8f2947724d0b5ce60c on remote branch

Change-Id: I6bc2e9a6a83c1a7a08d5fac6f5f5c9f2dfb394fe