Merge "Make Condition use CLOCK_MONOTONIC" am: 7f932afefc
am: 36ba2fbef7

Change-Id: Ib15f34fcb36761dbbc7f3094a3a76a771792b593