Closes-Bug: #1495604 Change-Id: Ibf26b9ef4f7ae655bcd88fad863985f7309a4d17 (cherry picked from commit 33f5aeb320)
33f5aeb320