Bug: 26409579 Bug: 26080105 (cherry picked from commit f06d6bc0) Change-Id: I7eeea06e7df49a7f8af4c4cb71da58c21f1c185b