Merge changes from topic "scheduler_fps" into qt-dev
am: 93822a0508

Change-Id: I7143afa68bb575aa6c762c8a9e56404b8a8908d6