Bug: 15567083, 17439961, 17510489, 17478752 (cherry picked from commit 035592c5) Change-Id: I828dc6775044b5050c2520eb097abe6a920fd3ee