Merge \"Attribute throttle time to previous loops write time\" into nyc-mr1-dev
am: bf6dc1af5b

Change-Id: I4bc857144d49760097f7344c1d58ad7444b66548