Merge "Add mode bits to open calls" am: cebf7ea40f am: 385dae25c5 am: 94f2d7653c
am: da162a77f1  -s ours

Change-Id: I37b921fcff9a5fa5104a2e59de3e1dad48c88e1d