Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Ib590259bb9420ae3f908e77c5c8e86c36a200163