Address Rebasing Error
Address Rebasing Error

Address a rebasing error I introduced while responding to Travis's
review comments.

Change-Id: I4e081708633a4a1a7e14d2aa1debd2e8e0f7aaec

garmin/connectiq-apps,garmin/connectiq-apps,garmin/connectiq-apps,garmin/connectiq-apps