Bug: 144374158 Test: make Change-Id: I86a479affb8e0fa8e48734324a6a05c68230d910
Bug: 145232482 Test: make Change-Id: I9ba0618bb6f95f5caadc3ac9ac75e97efa5573c6