Bug: 19125146 (cherry picked from commit 00ca8473) Change-Id: I67184371597fdcc9d9186172c1cff4efd3ca3093