Merge "Add test to open and close with no mmap" am: 366905fe4f
am: 356f25b55e

Change-Id: I77b6f42b242f0e321bd66e0ab35567973ae3682f