Bug: 18106938 Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29 (cherry picked from commit 178d3b54)