Merge 3ba31701681587a2aba85ad4fed3b0d48e265fd0 on remote branch

Change-Id: I6bc07c47a8051d355e5389e05b233f234dc917dc