Bug: 20516964 Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631 (cherry picked from commit 63539bd5)