Bug: 26080105 Partial cherry picked from commit db4a79a5 Change-Id: Ifef4ec0d153b8d30941a339d7f9052889631f84c