Merge "packages/apps/Provision: Set LOCAL_SDK_VERSION where possible." am: 01fab1d3e4
am: 1df4c85042

Change-Id: Iac69e77bec602763b511938b519ae5dead1d4421