Bug: 22779653 Change-Id: Ia6af57e9a6ea59faf01c2587bab133136c5fc73a (cherry picked from commit 6be49e8a9a26242cc9c49549c3a015662461fc48)