Follow-up on comments from splitting app info

Bug: 19511439
Change-Id: Id1395597262f66514808f71d99978120dbba70e1
11 files changed