Merge changes from topic "native process registration" am: 8106c8e09f
am: 01c95dde60

Change-Id: I3cd561ed004b3c01cddb8a2f46762a36e6744f34