(cherry picked from commit 90328ac5) Bug: 28685551 Bug: 27682580 Bug: 28830038 Change-Id: If568013bf3c82c1df9b282522712d9af5ca5945d