Merge changes from topic 'assemble_vintf' into oc-dev
am: ffd66c35bf

Change-Id: I73f8430739e3d129716c3569c000433786099bf1