Bug: 17108693 (cherry picked from commit 3ea69c0a) Change-Id: Ide8158cc3e12e604f4fa344cd881fe6f68476ab7