Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Iae58e61160e4a3353911658c91ae17da6ff91d99