Bug: 17943949 (cherry picked from commit 07c9c63e) Change-Id: I765285b7e1a17928778ac161c73b2e48b82b54d6