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

Change-Id: I4c4dadc2be7d69547283eda3567468cbfefd1074