catch up with cm10dna tree

Signed-off-by: travp624 <travp624@gmail.com>