Bug: 17731498 (cherry picked from commit f8896c6c) Change-Id: If97e1ccf593a2ed6c2356077e660d6fd88a05875