Bug: http://b/22025550 Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf (cherry picked from commit 9813f5ba57)
9813f5ba57
Change-Id: I5afaf70caa590525627c676c88b445d3162de33e