Merge changes from topic 'mark_vndk' into oc-mr1-dev
am: debc264b5b

Change-Id: I55d3391d8a552f26e0b0cba5f9216c796aa136ee