Merge changes from topic 'vintf_edi' into oc-dev am: 1dcbfac96a
am: b12e0cccd1

Change-Id: Ib235418c8ed3ec7c0f149efdfe03dc33cba98dd1