Merge "Merge "Reduce app size by downgrading inactive apps" am: 8bcd66d3 am: b11556fc -s ours am: 28ff2fbe -s ours"