[automerger skipped] Merge "Fix new registration APIs as per API council guidelines" am: bfc11892e1 am: 4aea29f73f
am: bac75672f9 -s ours
am skip reason: change_id I634cbf2b9cd91bfa53729ccc4bfc92e9c4808976 with SHA1 709081287b is in history

Change-Id: I8a7d5f3157bcf01485834d9477fe2efa66bacf23