Merge bf58f161758b41e39bfddc39e9f1e49062a1773c on remote branch

Change-Id: I767e8ee1027431eacbdde2cdbb0f075d2ba20d25