Bug: 162052785 Test: m -j vts Change-Id: I58bc808a82b2128bb8774f762f9b9fcecd2614fb
6b62c58a9a
8c22c3862f
6684ee8c36