Merge "Fix new registration APIs as per API council guidelines" am: bfc11892e1
am: 4aea29f73f

Change-Id: I2990bb1024cdbeb5c36be3c3f1847f3312ab5c2e