Merge "Fix a call to openat with incorrect arguments" am: 18044da576
am: 5675b05f52

Change-Id: I8e1952130cfa2110051abc5a8148e01e0525a1ac