devtree update from 98.72.18

Change-Id: Id2e8813d214f5135daf193743cfb0deac762fa59