Merge "Remove redundant register storage class specifiers" am: ed91226cec
am: 664e5f2794

Change-Id: I9d17d79e37bac378e853d6102b26a8c354790957