Refactoring for robustness
Refactoring for robustness

Change-Id: I492258a509f64240b6d1901669a6992f49ada3e6
Signed-off-by: Li Yi <9b065897ddf8076b8519f3c6d24b707446157dae@gmail.com>

denverdino/machine-1,denverdino/machine-1