[automerger skipped] Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-dev" into pi-dev am: de5eee4f9e
am: c25b99067a  -s ours

Change-Id: I7ae6891d6071874f6c013637ebe04f5698e8e5ff