(cherry pick from commit 290f4b97) Bug: 28770668 Change-Id: Ice56b129a243296b2691d55e8f8c35b478b1f481