Bug: 20925281 Change-Id: I136014ebc12c3afcb154722a8fec44b1d5f003e9 (cherry picked from commit 64904d39f8)
64904d39f8