Kernel Change: pa/1887451 Test: N/A Bug: 182996456 Change-Id: Ia62f8a0b8b0c57270a3c8ed82cb64a79fbcbfe79