Merge "apf: Increase test coverage of LDDW / STDW" am: e03b8ee7e0 am: 0bf54f4a2e
am: b1883f9abb

Change-Id: Iada367d6083c7dd2724e748bba09a0819c3d0285