Bug: 20864928 (cherry picked from commit 54148aab) Change-Id: Iffeb2fb6e536d52bdf2d73afa0a65a48233e74b8