Refining shimmy

Bug: 11858581
Change-Id: I7eefc5189caefc6d23d2dbbca243632db716b0c3
4 files changed