am 0c4249ae: am 2c7d0f20: Merge "Fix restore position warning and static track adjustment" into mnc-dev

* commit '0c4249ae67222d09c1a0a8149672e4f1d9f3789f':
  Fix restore position warning and static track adjustment