Merge "DO NOT MERGE: Mimmum application memory should be 96MB" into kitkat-cts-dev
automerge: 09c6bcf  -s ours

* commit '09c6bcfb2ef6388efe24b870a42180dd7dc83d8b':
  DO NOT MERGE: Mimmum application memory should be 96MB