Merge "Add CM_SNAPSHOT ro.cm.version label option for SNAPSHOT builds." into ics