Bug: 26182816 Change-Id: I3d5704794b17e0ec536a979a544a97a3e1f7b5c7 (cherry picked from commit f79ef7ff21ca9301035b9130d2d864112e8f9ae3)