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

Change-Id: Iebb8aa5818105e683b1b590fcc819a34db739ad6