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

Change-Id: Ie176bedc6828e1ee83f6617dced0aa7868764ae7