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

Change-Id: I1ed37d63e3ecd4041851d9de786dd21fd184264a