Merge "GuidedStepFragment sample: add id to radio/checkbox" into nyc-dev