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

Change-Id: I23b309642a1c7585031ea2853fa7e99bddffb83a