Merge "Execute pending transactions after FM state change." into oc-dev
am: d58d802c5f

Change-Id: I03dd1d557b83bd98086330fd2006ec194be62b1b