Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM."...
Merge "DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM." into cw-e-dev am: c46a70e8 -s ours
am: 79c1e7bf -s ours
* commit '79c1e7bf':
DO NOT MERGE ANYWHERE Default missing DevType and DevClass in NVRAM.
Change-Id: I03070dbd437422fdb788cba1e09e0fd417259210