Bug: 132153067 Bug: 134057371 Test: Only stubs submitted. Change-Id: I1107492445126127a92649abf97268c817cedf1b