Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ie124ce16dae24d5121c5bfdc733bc442f8de923d