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: 99b3b0d2
* commit '99b3b0d2':
Change-Id: I4c55b26c23f049de584cbbc13c130778c14b7121