Merge "Low battery notification has unique sound." into oc-mr1-dev am: 9ac6be4a66
am: ec3481b55d

Change-Id: Ic6feb4f79f2d9a7fb3334333cf54b75e616ec548