Merge "Set the decay timer for all forked apps." into oc-dev
am: 694570957d

Change-Id: I6e44070a2ffd1629dd2d50ab90831b01474b6353