Merge "Fixed min_free_bytes prop name and usleep time default" am: 7522da3036 am: 23e15b78ad
am: 511073b610

Change-Id: Ic796c1d7f636bb5718eee599e25aed83784bd246