Restored the fixes from the About Rework

Change-Id: I59883827701ce9e5c9fbbb2814edc28f135e9636
Signed-off-by: irivin <irivin@qce.qualcomm.com>
Merge "Restored the fixes from the About Rework"