Bug: 29748723 (cherry picked from commit 0879eb41ca) Change-Id: I187aa5b96c283323edb6a1ebe5005d70e19bf563
0879eb41ca