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

Change-Id: I0f5fc711eb3ce6029ec54553e2e423f2c42f3445