am 80cc1ebd: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." into jb-mr2-dev am: 5ae370c753

Original change: undetermined

Change-Id: I6c9a7c2a1de2022b1af0a0dbf411dafc78edce51