Merge changes from topic "appfuse-upstr" am: a2786c1f53
am: af57e83d44

Change-Id: I1287540b7265c96344cb91eb2119fc59919dc2c9