Bug: 15298065 Bug: 15327280 Change-Id: I4dfade1afe3578e29daba777567f81d4ec782956
This CL must be checked in together with I27755f45fd. Bug: 14419121 Change-Id: Iaf032f638c9ed36f2d3b924fdd42f0502abf487e