merge from d802

Change-Id: Ie43af6cd888ea79079d1793f577e2f935191dea0