Bug: 27688793 (cherry picked from commit c6068709) Change-Id: Idcf6b8023a15c816168ce42456d2bd7b463d0951