am a24d0474: (-s ours) am 55e5c288: Merge "DO NOT MERGE Fix assertion to use...
am a24d0474: (-s ours) am 55e5c288: Merge "DO NOT MERGE Fix assertion to use complete load check rather than one flag." into jb-dev
* commit 'a24d0474':
DO NOT MERGE Fix assertion to use complete load check rather than one flag.