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

Change-Id: I9b475b9951680bea22307b5a19bd1f5ed76398bb