Merge changes from topic "libvintf_cp" am: 9bab2f5fa2
am: 0998353f08

Change-Id: Ie8a7521d4c20f871b57267b88488add9d9c22461