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

Change-Id: Ibca8c0202ff702be57f128b0cc24a8679d0a8083