This reverts commit 07759cf9fdba538a488399abe47a1d417ed27b13. Reason for revert: <miss one patch> Change-Id: Ie0ac79b9db0259881ddc20a23feff3e6a4b0c9f6 (cherry picked from commit a09b2cacfbacff5ee26ed757a9f76c9dfb7cca09)
This reverts commit 07759cf9fdba538a488399abe47a1d417ed27b13. Reason for revert: <miss one patch> Change-Id: Ie0ac79b9db0259881ddc20a23feff3e6a4b0c9f6 (cherry picked from commit a09b2cacfbacff5ee26ed757a9f76c9dfb7cca09)