Merge "Make setTimeLapseConfig take frequencies instead of periods." into oc-dev am: 2200bb2e96
am: a1cd6aa4ef

Change-Id: Ia87085954afae9dd88fa73b30442d83603c79bcc