(cherry picked from commit 0785676a) Bug: 15765976 Change-Id: Ic1d32743583539fa03924d1c0c122663f37ac3ac