Align with the change: 2070d4267c Close-Bug #1241256 Change-Id: Idc16d75258baa1f5ee05ff48bfadc358c7655e55
2070d4267c