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

Change-Id: I715bc43c7df865f350162fdf620a354782304fdf