Track M7 local and HTC vendor  now

Change-Id: Ia88413b1e133d7689af3c01795f6c548d4e36d3b
Merge "Track M7 local and HTC vendor  now" into jb-mr2