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

Change-Id: Ia02de6226d85713037fcd86726fec4a04d5d630a