Merge remote-tracking branch 'origin/master'

Change-Id: I88c1d1a132fae3bc009db302298eeb9554f38757
Signed-off-by: HsingPeng <bboxhe@gmail.com>