assert and getbuildprop changes

Change-Id: I221e022c1344c8e3ba3d75c1df93666f575331af
second part of previous commit

Change-Id: Ic38dce7208dc4ef69c10b2360a31def0125802b4