Bug: 274074858 Test: build pass Change-Id: If799aaaf294cc7f45a02420a4bf0a188a83bd2b4
from: 858c0f08e332220d80a9eef8ddcd39ef4d5296ee with updated device path Bug: 248399843 Change-Id: I215a40a4f4719d5432e87401f4a3214c5189ba20