Bug: 17337831 (cherry picked from commit 1c365cb4) Change-Id: Ice100e42eeac4b9c3b77737a546ec33174adcb2f