Merge "Use setmntent with "e" option" am: 396040ca2c
am: a92bdeb7f5

Change-Id: I269ba8a35f5441e78c6d7945ce4726eae3e33cdd