data usage and merge of codename13 settings....

Change-Id: Ic0341f072241a311b7a32b0fed942293390c8900