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