Bug: 17188805 (cherry picked from commit b9d6a55e) Change-Id: I0a271aa214eebe11a8442ebf68811e0d8f077d36