Bug: 28552165 (cherry picked from commit 59399abc) Change-Id: Ic7d687fbb20d5bd68a606c40fe60007b05f1c59b