Merge "Merge "Do not show exception stack trace when no child profile key"...
Merge "Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513 am: b79fedc9" into nyc-mr1-dev-plus-aosp
am: 47f16196
* commit '47f16196':
Change-Id: Iedef161ae076e16feb62568ac97f98fc5b8878e5