Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev am: 9635756473 am: 16fe510e03
am: 4091aebac0

Change-Id: I084ee83877716868a337dcf7fdef8b54d0cb0b1b