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

Change-Id: I48906af4ae76d4d4cded51bec625f87926b2015d