Bug: 121020566 Test: vts Change-Id: I1ac193dd144b840e4f3e3a397c0c93327ac00186 Merged-In: I1ac193dd144b840e4f3e3a397c0c93327ac00186