Bug: 216258666 Test: build pass Signed-off-by: Carter Hsu <carterhsu@google.com> Change-Id: Ia67f75c4945117dab59d769c762e7867fcf1ac2d
from: 715ff58363e1fd4edc7c1bd428a77af6ddcb7684 with updated device path Bug: 198128551 Change-Id: I2d9eace5077290b74ef00efb7304128f344514c1