am b36c01c0: am c73beb1d: Merge "Change to update CFI after subId has been...
am b36c01c0: am c73beb1d: Merge "Change to update CFI after subId has been updated." into lmp-mr1-dev
* commit 'b36c01c0':
Change to update CFI after subId has been updated.