Merge "DO NOT MERGE increase generic_mips system partition" into lmp-dev am: 198262ff83  -s ours am: 953a9eb3d3 am: 14d24b3d5f  -s ours am: 0d45d96082
am: 6f45a5f721

Change-Id: I8dcd653967d64d937c6668f5ac96ea9b1e318e1f