track local sammy props

Change-Id: Ied7cdf7663fadae4342743375fe57de7efc6326a
Merge "track local sammy props" into jb4.3