Merge 8664008c to master

Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636