Merge changes from topic 'libvintf_cp'
am: 9bd4c20764

Change-Id: I277b37789fdc78ed2dcb5c50c1fda9c40444a4e8