Merge changes from topic 'TransferInstallSession-oc-mr1-dev' into oc-mr1-dev
am: fdaad13803

Change-Id: I2eaaf989fb6e5f006edd974d56386731d778e604