New branch for olympus

Change-Id: I99ecfb7ded0aac7d28d57b3f86df645fd631436d