Bug: 153516511 Change-Id: I7512849efd91d4aa2b9da6aba0602c65422c606d (cherry picked from commit 5626583228)
5626583228