Merge "rootdir: init.rc to limit discard size to 128MB"
am: 7bf14bb932

Change-Id: I214c5845367bc2719782535e67520b3021d36a9d