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

Change-Id: Ieae6cd0439d75e8858a16b44393fd248ddffcaa3