Merge "Upgrade to 8.7.1"
am: 872f32065e

Change-Id: Ib0aec8114f4c067c4ee934e64afa2860dea7b8b4