(cherry picked from commit 2a168a5c) Bug: 26422335 Bug: 26889631 Bug: 27606665 Change-Id: I47fc0480552b8151ecdfe9c237848b49b9dedf98