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

Change-Id: Ib31382dea8bab03ad54ff535d8a670a8eb5113d5