Merge changes I820f395e,Id8995d6f,Ic2ceba15,I9fba4df9
am: 65bdb3ff68

Change-Id: I77e70afcbcfd767c9c530ceaa1d07d18fb7d1255