manual merge 0244ecf

Change-Id: I404698b15c85dfb09cc1f2c767e59aad99713893
2 files changed