Merge changes I6c489eb4,I552b40c0 am: 75c88ab266 am: 174976cf78 am: ec07bc443d
am: 0239ccd0e9

Change-Id: I61cfa992cbb609ef2e4333e2fdb6e8d705850ae9