Merge "Fix full content test" am: 9fa8d06ecc

Change-Id: I41c27ed81cfb803954d773a07a4d0747bea4b33f