Align with templates while we are at it Change-Id: I3cd279191c7bd3582f1c1f80c588eb26cf9da933
Change-Id: I97567d55aa4747e94ac09348630f2f7beeabf934