Bug: 162052785 Test: m -j vts Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
ba4d532fee
73122cd284