am: 998c5544 Change-Id: I12a0f4c5fb768bdaa3a4baa4fa5bd7964b80110e (cherry picked from commit d580a85b)