Bug: 16843953 (cherry picked from commit c4a7acf5) Change-Id: Ib59e10a5d97a20ea1a013587645e0eeb204eda8d