Bug: 19706593 (cherry picked from commit 747e1f7a6d) Change-Id: I9a605c736a2fa909cd4999e1e8d022d49a562767
747e1f7a6d
Bug: 19706593 (based on work in commit 8d0cd7ffd903a753c6bb5c6f33987a7a66621cef) Change-Id: I9699275a63f2d0a110435bd4a725d7dfcce4ed90