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

Change-Id: I42509f2741042366e0c5bd138ffc6855a72794dc