Bug: 21382373 (cherry picked from commit 42ff9223) Change-Id: I6c513cbf3c509ef855dc7bc0d62abebed8570b37