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

Change-Id: Ifa016ce8a4fcb3a43a03d0f1126c01638cbf21ef