Merge "apf: Add immediate encoding tests for LI" am: 9ee5bb0037 am: b0e8ab677b
am: b5d0b5f9b5

Change-Id: I3cf8a3392456b827b06c1b0b3ffaa7fab1331389