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

Change-Id: I17ba32e60a9a2545de659c0ff30d6ed5a54f829a