Android 7.1.2 Release 6 (NHG47K)
Update to latest catapult (be85e5fd)
am: 7332cdb423

Change-Id: Icfcbfa93ef52e2a62a291cbd39ba37f381d4c21d