Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev
am: afccacad68

Change-Id: I9b6870028ce598c4c9066031c4706dbb0555c38d