track m7 repos

Change-Id: Ica8b9727ca17889cc0876268d35382285e80d067
Merge "track m7 repos" into jb-mr1