(cherry picked from commit b1a113f618) Bug: 16530747 Change-Id: I0d1be3dcadfa5128ffe04cec60f6c998dff61991
b1a113f618