Android 4.0.1 release 1.1
Merge "Support merging device info metrics." into ics-mr0