Update asserts

Change-Id: I9768a99374e27b9f80b9f9289d46b720651783e6
Merge branch 'cm-10.2' into martincz