Merge "Add mode bits to open calls" am: cebf7ea40f am: 385dae25c5
am: 94f2d7653c

Change-Id: I4c9671b6dbc9bce7ad0b8af8021301232aa491db