Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev