bug:20037935 (cherry picked from commit 5ae13250) Change-Id: I4bbec76988cfd3061084055c16d2d9ef46845f0a