Merge "Upgrade to 8.7.1" am: 872f32065e am: e068f4e12c am: 2df28a2a90
am: 484b8e1326

Change-Id: I11ea31ec7e743ccd136b837c8cbd91bb33007af6