Merge changes from topic 'vintf_compat_mat_update' into oc-dev am: 5b14a8823e
am: e533ac83b9

Change-Id: Iee7c4cda8e1927b86d1766c076c2ee9850016d50