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

Change-Id: I4b00e86b77e7414c534421f05c0f2e8471a56be2