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

Change-Id: I62b68548a72d98731eea1d4db448db8a172320e3