Merge "Add ondevicepersonalization stubs and bootclasspath fragment"