Merge "Made a note that app names may not contain delimiter characters" into pi-dev am: c610677258
am: b15319dcb5

Change-Id: Idc759f4d8e921784715719f8bc68a45b6c2095a8