Attempt to make bunnies happy

Change-Id: I76df6da3a6e2cdcf75bb9eafce13092ad1420b81
Merge "Attempt to make bunnies happy"