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

Change-Id: Ibc1a443c1c3a34edde835361e538a8d9cb8addb9