Merge "Frameworks: Remove warning for SystemProperties.get" am: c589496ce9 am: b72c0626f5 am: 16e676be4b
am: 3b01d0a09a

Change-Id: Icdc349598538e7cb2740e0829e797ec02ff0209a