Bug: 16875245 (cherry picked from commit 372d0df7) Change-Id: I38fa14226ab94df2029ca60d3c8898f46c1824c7