Merge "Change "current" sdk version to 16 as it becomes official" into gb-ub-photos-arches