am 478605ba: am 448e7322: Follow up change for  I5f166a738f6e84a1b807be

* commit '478605baa460d2d595c7ed0da2790b147727d284':
  Follow up change for  I5f166a738f6e84a1b807be