Merge "b/3004029 Fixed content resolver loss" into gingerbread