Bug: 21702651 (cherry picked from commit 511d4089) Change-Id: I059e0b841543334cd08a27431e0ea853b42e4f35