Merge "Do not fail session.commit on current thread" into oc-mr1-dev am: 304d267066
am: b1e0282aa3  -s ours

Change-Id: I4adc45868a7c6bba1869ca4b41ef640664ea32ee