Merge changes from topic "Porting-ONSAPIChanges" am: 31c7607ee6
am: f6b0d994a7

Change-Id: Idf128d17a2fac096ca5e28000648638c1d70fff2