Merge "user_tags: Remove 01-test target" into gingerbread