Bug: 15765976 (cherry picked from commit 905e6d58) Change-Id: Ic7435308e8b521886f42ac7bf59531924921ea67