Merge branch 'master' into wyh

Change-Id: Ib4d85ca5d998bbcd1d7149f092d680c3cc76bf66