Bug: 17703163 (cherry picked from commit 2beeb825) Change-Id: Ic4beae99734ec15b8ead362fbf76a69eceae5980