Nothing wrong with | in this case, but || is canonical. Bug: 19797138 Change-Id: I5f145736a5470f7cde06efce9a217d86eda2135f
6695b992
3d992507
09dff843