Merge changes from topic "libpac_C_api"
am: c0f3daa11a

Change-Id: I77ccde03e41873ef9b9bb1621ae4e0d19c13fc9c