Merge "Merge "Reduce app size by downgrading inactive apps" am: 8bcd66d35f am: b11556fcf6  -s ours am: 28ff2fbec5  -s ours"