Merge changes from topic 'sspatil_vendor_rules_cleanup' into oc-dev
am: ed3458c2ee

Change-Id: I47746d594572760d25b569fb877351c4f1ea1628