bug:21862741 (cherry picked from commit a09ff9c1) Change-Id: Ia8e903e09a7f9c2b8ef7cf3522f73f154534b81f