Bug: 162052785 Test: m -j vts Change-Id: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21 Merged-In: I627d6790aa08aa9c6e3c5b8bdc533213ee08de21