Snap for 8746144 from e4819095405163a12bf42aeb40c1411a85216566 to mainline-scheduling-release Change-Id: I46e4047f4a8b3197cd46365cee7cab7eabcb0fce