Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev
am: f051c127c6

Change-Id: Ic0990ed845344f05d00586534d78c0aac42ed312