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

Change-Id: Id2cf66ea8305a4a4606ed032b9976d972fba4763