Bug: 27262745 Bug: 27218415 (cherry picked from commit b736af0b) Change-Id: I7e479109a9c71abc502b4cc470e1dbd45af64139