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

Change-Id: If1309a7eca08359525464c3c2ff344abc63e2330