This tests some changes made to bionic. Change-Id: I7ff8c7f94f6b4bfff64d4e15d4a1a3516a453180
63d944d6
93a8225e