Bug: 135922046 Test: m Merged-In: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115 (cherry picked from commit d734c790) Change-Id: I3fcdc751c91bd762a3fb19b74c1652be1c7ff115