from: 715ff58363e1fd4edc7c1bd428a77af6ddcb7684
with updated device path

Bug: 198128551
Change-Id: I2d9eace5077290b74ef00efb7304128f344514c1