Merge 54339470836673951ccaf36cb9f87e1466d357e5 on remote branch

Change-Id: I46bd35f454437bd97ad487bd828062eac5e7a1f2