Bug: 16031597 Change-Id: Ifa547cdfde19f67a3c85d39c1d50ae317bca5932 (cherry picked from commit 3852987b)