[automerger skipped] Merge changes from topic "Porting-ONSAPIChanges" am: 31c7607ee6 am: f6b0d994a7
am: acf23ad83e -s ours
am skip reason: change_id I5df2311d91fdab34563148b4466163696e52faf9 with SHA1 6315e59275 is in history

Change-Id: If69b52328c406f702d4bcc73463f259240f537e8