atmosphere 2.2.1

Change-Id: Ic8d99209ccac41995be39dc80947a76beb7f6ad3