Merge "print update manual" am: c510d7c5ee
am: a94900e5e8

Change-Id: I247be8746de590677ca89a2388f0c970c547a2af