Merge "Simplify some of the logic." into oc-dev am: d8b5621640 am: 41ce373022
am: 2a25b379e1

Change-Id: I8e77acd699be2624724477717718e55d947e2362