Fixes b/13289050, b/13418851, also fixes 13418671. Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77