Revert "Switch to milestone instead of Official"

This reverts commit 178bd992c5658c83dffb2f5ae96f3cdd576f00ba.

Change-Id: I3e6a7095d3fdd56760297f369f12050488ced31b
Merge "Revert "Switch to milestone instead of Official"" into kitkat