Merge "Camera2: Add SDK annotations" into mnc-dev