Bug: 17762003 (cherry picked from commit 07e5bc15) Change-Id: I72d527831384ff5dde013a4c8dfe639fbec165f5