Merge changes from topic 'libvintf_cp' am: 9bd4c20764
am: 7fbbc2e85d

Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95