Merge changes from topic "libpac_C_api" am: c0f3daa11a am: ac97a1a7af
am: 4e850bbce3

Change-Id: If4fd930bf00df8449f72e59d73aaf7d87214f4a9