Bug: 16843953 (cherry picked from commit 2f4cf2cfd1) Change-Id: I223f9041e424be024265e46bcff19cd9dfd18dfc
2f4cf2cfd1