Mako RC overlay: fix typo

Change-Id: Ia749cc3c29a74d5bc0c9cfb0f45694a3d31e5725
Merge "Mako RC overlay: fix typo" into jb-mr1
Update Grouper fingerprint

Change-Id: If61d126d4420bbcc1c7ccdc24c51868ff9e48e5d
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1