Bug: 318310357 Bug: 298898436 Bug: 298891941 Test: Build pass Change-Id: I6e77f2a8858e17e3e56c01769e6eb5b4fd478a04