Track M7 local now

Change-Id: I91642e0902301212eaea24e0640435893bf1bd60